Skip to content

Complete CCPPization of Beljaars orographic form drag scheme#396

Merged
jimmielin merged 10 commits into
ESCOMP:mainfrom
jimmielin:hplin/beljaars
Jun 23, 2026
Merged

Complete CCPPization of Beljaars orographic form drag scheme#396
jimmielin merged 10 commits into
ESCOMP:mainfrom
jimmielin:hplin/beljaars

Conversation

@jimmielin

Copy link
Copy Markdown
Collaborator

Tag name (The PR title should also include the tag name):
Originator(s):

Description (include issue title and the keyword ['closes', 'fixes', 'resolves'] and issue number):

List all namelist files that were added or changed:
A schemes/beljaars_drag/beljaars_drag_namelist.xml

List all files eliminated and why:

List all files added and what they do:

A       test/test_suites/suite_beljaars_form_drag.xml
  - test SDF
 
A       schemes/beljaars_drag/beljaars_drag.F90
A       schemes/beljaars_drag/beljaars_drag.meta
A       schemes/beljaars_drag/beljaars_drag_interstitials.F90
A       schemes/beljaars_drag/beljaars_drag_interstitials.meta
  - Beljaars orographic form drag scheme, necessary interestitials
  - interstitials split off so beljaars_drag.F90 scheme can have a namelist attached to it

A       schemes/sima_diagnostics/beljaars_drag_diagnostics.F90
A       schemes/sima_diagnostics/beljaars_drag_diagnostics.meta
  - diagnostics scheme

List all existing files that have been modified, and describe the changes:
(Helpful git command: git diff --name-status main...<your_branch_name>)

M       schemes/vertical_diffusion/diffusion_solver.meta
M       schemes/vertical_diffusion/diffusion_stubs.F90
M       schemes/vertical_diffusion/diffusion_stubs.meta
  - moved formerly Beljaars interstitials to beljaars_drag_interstitials:
    beljaars_add_wind_damping_rate_run, beljaars_add_updated_residual_stress_run

M       to_be_ccppized/error_messages.F90
  - fix stray tab to get rid of compiler warning

List all automated tests that failed, as well as an explanation for why they weren't fixed:

Is this an answer-changing PR? If so, is it a new physics package, algorithm change, tuning change, etc?
No
New physics package, CAM regression tests, CAM-SIMA snapshot all pass

If yes to the above question, describe how this code was validated with the new/modified features:

@JulioTBacmeister JulioTBacmeister left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks better than the original

Comment thread schemes/beljaars_drag/beljaars_drag_interstitials.F90 Outdated
Comment thread schemes/beljaars_drag/beljaars_drag.F90 Outdated
@jimmielin jimmielin requested a review from cacraigucar June 16, 2026 18:17
@jimmielin jimmielin requested a review from nusbaume June 18, 2026 19:51

@nusbaume nusbaume left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @jimmielin! I have some requests, but they should hopefully all be simple to implement (and of course if not please let me know)!

Comment thread schemes/beljaars_drag/beljaars_drag.F90 Outdated
Comment thread schemes/beljaars_drag/beljaars_drag.F90 Outdated
Comment thread schemes/beljaars_drag/beljaars_drag.meta
Comment thread schemes/beljaars_drag/beljaars_drag_interstitials.F90 Outdated
Comment thread schemes/beljaars_drag/beljaars_drag_namelist.xml
Comment thread schemes/sima_diagnostics/beljaars_drag_diagnostics.F90
Comment on lines +7 to +9
<!-- Beljaars SGO form drag -->
<scheme>beljaars_drag</scheme>
<scheme>beljaars_drag_diagnostics</scheme>

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add Beljaars to the CAM5 and CAM7 suites as well?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, added to the two suites.

@jimmielin jimmielin requested a review from nusbaume June 22, 2026 16:03

@nusbaume nusbaume left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for responding to my requests and questions @jimmielin! I just had one last (optional) request, but nothing that should hold up this PR. Thanks again!

Comment thread suites/suite_cam5.xml Outdated

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we still need this commented-out scheme in the SDF?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes I do, thank you for spotting this! Added now that Beljaars is in the CAM5 suite.

@jimmielin jimmielin merged commit 75237f6 into ESCOMP:main Jun 23, 2026
4 checks passed
cacraigucar added a commit to cacraigucar/atmospheric_physics that referenced this pull request Jul 1, 2026
atmos_phys0_24_000: Complete CCPPization of Beljaars orographic form drag scheme (ESCOMP#396)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement New feature or request

Projects

Status: Tag

Development

Successfully merging this pull request may close these issues.

CCPPize beljaars_drag

5 participants